• Create ticket/issue

Follow the guide to enable codebase context checks.

Objective: Ensure all identifiers clearly express their purpose and intent, making code
self-documenting

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Objective: To prevent the leakage of sensitive system information through error messages while
providing sufficient detail for internal debugging.

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Objective: To ensure logs are useful for debugging and auditing without exposing sensitive
information like PII, PHI, or cardholder data.

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Objective: Ensure all data inputs are validated, sanitized, and handled securely to prevent
vulnerabilities

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Objective: To create a detailed and reliable record of critical system actions for security analysis
and compliance.

Status:
No audit logs: The new performance-related logic (e.g., caching suppliers and node context) introduces
critical stats behavior changes without adding any audit logging for accesses or
computations that could be considered sensitive operational actions.

@Override
protected Supplier<IndicesQueryCache.CacheTotals> createNodeContext() {
    return CachedSupplier.wrap(() -> IndicesQueryCache.getCacheTotalsForAllShards(indicesService));
}

@Override
protected void shardOperation(
    IndicesStatsRequest request,
    ShardRouting shardRouting,
    Task task,
    Supplier<IndicesQueryCache.CacheTotals> context,
    ActionListener<ShardStats> listener
) {
    ActionListener.completeWith(listener, () -> {
        assert task instanceof CancellableTask;
        IndexService indexService = indicesService.indexServiceSafe(shardRouting.shardId().getIndex());
        IndexShard indexShard = indexService.getShard(shardRouting.shardId().id());
        CommonStats commonStats = CommonStats.getShardLevelStats(
            indicesService.getIndicesQueryCache(),
            indexShard,
            request.flags(),


 ... (clipped 6 lines)

Learn more about managing compliance generic rules or creating your own custom rules

Objective: Ensure comprehensive error handling that provides meaningful context and graceful
degradation

Status:
Null cache handling: New helper methods compute shared RAM and stats across shards but rely on external
services and suppliers without explicit error handling or null checks beyond basic
ternaries, which may require verification in broader context.

public static Map<ShardId, Long> getSharedRamSizeForAllShards(IndicesService indicesService) {
    Map<ShardId, Long> shardIdToSharedRam = new HashMap<>();
    IndicesQueryCache.CacheTotals cacheTotals = IndicesQueryCache.getCacheTotalsForAllShards(indicesService);
    for (IndexService indexService : indicesService) {
        for (IndexShard indexShard : indexService) {
            final var queryCache = indicesService.getIndicesQueryCache();
            long sharedRam = (queryCache == null) ? 0L : queryCache.getSharedRamSizeForShard(indexShard.shardId(), cacheTotals);
            // as a size optimization, only store non-zero values in the map
            if (sharedRam > 0L) {
                shardIdToSharedRam.put(indexShard.shardId(), sharedRam);
            }
        }
    }
    return Collections.unmodifiableMap(shardIdToSharedRam);
}

public long getCacheSizeForShard(ShardId shardId) {
    Stats stats = shardStats.get(shardId);
    return stats != null ? stats.cacheSize : 0L;
}



 ... (clipped 47 lines)

Learn more about managing compliance generic rules or creating your own custom rules

Hoist the indicesService.getIndicesQueryCache() call out of the nested loop and
add an early null check to improve performance.

server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java [83-97]

 public static Map<ShardId, Long> getSharedRamSizeForAllShards(IndicesService indicesService) {
+    final var queryCache = indicesService.getIndicesQueryCache();
+    if (queryCache == null) {
+        return Collections.emptyMap();
+    }
     Map<ShardId, Long> shardIdToSharedRam = new HashMap<>();
     IndicesQueryCache.CacheTotals cacheTotals = IndicesQueryCache.getCacheTotalsForAllShards(indicesService);
     for (IndexService indexService : indicesService) {
         for (IndexShard indexShard : indexService) {
-            final var queryCache = indicesService.getIndicesQueryCache();
-            long sharedRam = (queryCache == null) ? 0L : queryCache.getSharedRamSizeForShard(indexShard.shardId(), cacheTotals);
+            long sharedRam = queryCache.getSharedRamSizeForShard(indexShard.shardId(), cacheTotals);
             // as a size optimization, only store non-zero values in the map
             if (sharedRam > 0L) {
                 shardIdToSharedRam.put(indexShard.shardId(), sharedRam);
             }
         }
     }
     return Collections.unmodifiableMap(shardIdToSharedRam);
 }

• Apply / Chat

Remove the redundant indicesService.getIndicesQueryCache() call inside the
lambda by capturing and reusing the queryCache from the outer scope.

server/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java [135-143]

 CommonStats commonStats = CommonStats.getShardLevelStats(
     indicesService.getIndicesQueryCache(),
     indexShard,
     request.flags(),
     () -> {
         final IndicesQueryCache queryCache = indicesService.getIndicesQueryCache();
-        return (queryCache == null) ? 0L : queryCache.getSharedRamSizeForShard(indexShard.shardId(), context.get());
+        if (queryCache == null) {
+            return 0L;
+        }
+        return queryCache.getSharedRamSizeForShard(indexShard.shardId(), context.get());
     }
 );

• Apply / Chat